From 184f64034de7f553ee2610d6a559e61c619af960 Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Wed, 11 Nov 2009 14:45:55 +0000
Subject: [PATCH] * editpage add-media-wizard binding fix * fixed remoteMw
 embed calls * stubs for k-player fallback * fixed native seek for videos that
 have not started playing yet * some timedText fixes

---
 js2/editPage.js                               |  11 +-
 .../example_usage/Player_Themable.html        |   2 +-
 js2/mwEmbed/libEmbedVideo/embedVideo.js       | 202 +++++++++++-------
 .../{flashEmbed.js => flowplayerEmbed.js}     |  17 +-
 js2/mwEmbed/libEmbedVideo/kplayerEmbed.js     |  74 +++++++
 js2/mwEmbed/libEmbedVideo/nativeEmbed.js      |  28 ++-
 .../libSequencer/mvTimedEffectsEdit.js        |   7 +-
 js2/mwEmbed/libTimedText/mvTextInterface.js   |  59 ++---
 js2/mwEmbed/libTimedText/mvTimeTextEdit.js    |  29 +--
 js2/mwEmbed/mv_embed.js                       |  45 ++--
 js2/mwEmbed/php/languages/mwEmbed.i18n.php    |  24 ++-
 js2/mwEmbed/skins/ctrlBuilder.js              |   2 +-
 js2/remoteMwEmbed.js                          |  56 ++---
 13 files changed, 360 insertions(+), 196 deletions(-)
 rename js2/mwEmbed/libEmbedVideo/{flashEmbed.js => flowplayerEmbed.js} (99%)
 create mode 100644 js2/mwEmbed/libEmbedVideo/kplayerEmbed.js

diff --git a/js2/editPage.js b/js2/editPage.js
index c03bf063e6..0e93231d2f 100644
--- a/js2/editPage.js
+++ b/js2/editPage.js
@@ -21,6 +21,7 @@ var defaultAddMediaConfig = {
 };
 
 js2AddOnloadHook( function() {
+	js_log("edit page js2AddOnloadHook::");
 	var amwConf = $j.extend( true, defaultAddMediaConfig, mwAddMediaConfig );
 	// kind of tricky, it would be nice to use run on ready "loader" call here
 	var didWikiEditorBind = false;	
@@ -49,17 +50,19 @@ js2AddOnloadHook( function() {
 	//Add to old toolbar if wikiEditor did not remove '#toolbar' from the page:    
 	setTimeout(function(){
 		if( $j('#btn-add-media-wiz').length == 0 && $j( '#toolbar' ).length != 0 ){
-			js_log(' old toolbar bind:');
+			js_log( 'Do old toolbar bind:' );
+			didWikiEditorBind = true;
 			$j( '#toolbar' ).append( '<img style="cursor:pointer" id="btn-add-media-wiz" src="' +
 				mv_skin_img_path + 'Button_add_media.png">' );
 			$j( '#btn-add-media-wiz' ).addMediaWiz(
 				amwConf
 			);
-		}else{
-			js_log('failed to bind via build section bind via target:');
+		}else{			
 			//Make sure the wikieditor got binded: 
-			if( !didWikiEditorBind )
+			if( !didWikiEditorBind ){
+				js_log( 'Failed to bind via build section bind via target:' );
 				$j(".tool[rel='file']").unbind().addMediaWiz( amwConf );
+			}
 		}
 	}, 120)
 
diff --git a/js2/mwEmbed/example_usage/Player_Themable.html b/js2/mwEmbed/example_usage/Player_Themable.html
index a32e539ef6..a17f857a13 100644
--- a/js2/mwEmbed/example_usage/Player_Themable.html
+++ b/js2/mwEmbed/example_usage/Player_Themable.html
@@ -26,7 +26,7 @@ src="http://upload.wikimedia.org/wikipedia/commons/2/29/Charles_Lindbergh_flight
 		poster="http://upload.wikimedia.org/wikipedia/commons/thumb/2/29/Charles_Lindbergh_flight_to_Brussels.ogg/mid-Charles_Lindbergh_flight_to_Brussels.ogg.jpg" durationHint="15"></video>
 <video class="kskin" style="width:208px;height:160px;float:left;" src="http://upload.wikimedia.org/wikipedia/commons/2/29/Charles_Lindbergh_flight_to_Brussels.ogg" 
 		poster="http://upload.wikimedia.org/wikipedia/commons/thumb/2/29/Charles_Lindbergh_flight_to_Brussels.ogg/mid-Charles_Lindbergh_flight_to_Brussels.ogg.jpg" durationHint="15"></video>
-<b>(ksin) Source Code used:</b><br>
+<b>(kskin) Source Code used:</b><br>
 <textarea cols="50" rows="7"><video class="kskin" style="width:400px;height:288px" poster="http://upload.wikimedia.org/wikipedia/commons/thumb/2/29/Charles_Lindbergh_flight_to_Brussels.ogg/mid-Charles_Lindbergh_flight_to_Brussels.ogg.jpg" 
 src="http://upload.wikimedia.org/wikipedia/commons/2/29/Charles_Lindbergh_flight_to_Brussels.ogg"></video></textarea>
 </div>
diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js
index 8bdefe3b7f..00cef43e44 100644
--- a/js2/mwEmbed/libEmbedVideo/embedVideo.js
+++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js
@@ -34,9 +34,8 @@ loadGM({
 	"mwe-video_credits" : "Video credits",
 	"mwe-menu_btn" : "Menu",
 	"mwe-close_btn" : "Close",
-	"mwe-ogg-player-vlc-mozilla" : "VLC plugin",
+	"mwe-ogg-player-vlc-player" : "VLC player",
 	"mwe-ogg-player-videoElement" : "Native Ogg video",
-	"mwe-ogg-player-vlc-activex" : "VLC ActiveX",
 	"mwe-ogg-player-oggPlugin" : "Generic Ogg plugin",
 	"mwe-ogg-player-quicktime-mozilla" : "QuickTime plugin",
 	"mwe-ogg-player-quicktime-activex" : "QuickTime ActiveX",
@@ -59,45 +58,45 @@ loadGM({
 var commons_api_url =  'http://commons.wikimedia.org/w/api.php';
 
 var default_video_attributes = {
-	"id":null,
-	"class":null,
-	"style":null,
-	"name":null,
-	"innerHTML":null,
-	"width":"320",
-	"height":"240",
+	"id" : null,
+	"class" : null,
+	"style" : null,
+	"name" : null,
+	"innerHTML" : null,
+	"width" : "320",
+	"height" : "240",
 
 	//video attributes:
-	"src":null,
-	"autoplay":false,
-	"start":0,
-	"end":null,
-	"controls":true,
-	"muted":false,
-	"wikiTitleKey":null,
+	"src" : null,
+	"autoplay" : false,
+	"start" : 0,
+	"end" : null,
+	"controls" : true,
+	"muted" : false,
+	"wikiTitleKey" : null,
 	
 	//roe url (for xml based metadata)
-	"roe":null,
+	"roe" : null,
 	//if roe includes metadata tracks we can expose a link to metadata
-	"show_meta_link":true,
+	"show_meta_link" : true,
 
 	//default state attributes per html5 spec:
 	//http://www.whatwg.org/specs/web-apps/current-work/#video)
-	"paused":true,
-	"readyState":0,  //http://www.whatwg.org/specs/web-apps/current-work/#readystate
-	"currentTime":0, //current playback position (should be updated by plugin)
-	"duration":null,   //media duration (read from file or the temporal url)
-	"networkState":0,
+	"paused" : true,
+	"readyState" : 0,  //http://www.whatwg.org/specs/web-apps/current-work/#readystate
+	"currentTime"  :0, //current playback position (should be updated by plugin)
+	"duration"  :null,   //media duration (read from file or the temporal url)
+	"networkState" : 0,
 
-	"startOffset":null, //if serving an ogg_chop segment use this to offset the presentation time 
+	"startOffset" : null, //if serving an ogg_chop segment use this to offset the presentation time 
 
 	//custom attributes for mv_embed:
-	"play_button":true,	
-	"thumbnail":null,
-	"linkback":null,
-	"embed_link":true,
-	"download_link":true,
-	"type":null,	 //the content type of the media 
+	"play_button" : true,	
+	"thumbnail" : null,
+	"linkback" : null,
+	"embed_link" : true,
+	"download_link" : true,
+	"type" :null,	 //the content type of the media 
 };
 /*
  * the base source attribute checks
@@ -109,10 +108,12 @@ var mv_default_source_attr= new Array(
 	'titleKey',
 	'title',
 	'URLTimeEncoding', //boolean if we support temporal url requests on the source media
-	'startOffset',
+	'startOffset',	
+	
 	'durationHint',
 	'start',
-	'end',	
+	'end',
+	
 	'default',
 	'lang'
 );
@@ -335,10 +336,7 @@ mediaSource.prototype =
 			if( $j(element).attr( attr ) ) {
 				this[ attr ] =  $j(element).attr( attr );
 			}
-		}				
-		//update duration from hit if present: 
-		if( this.durationHint )
-			this.duration = this.durationHint;		
+		}	
 					
 			
 		if ( $j(element).attr('type'))
@@ -430,7 +428,8 @@ mediaSource.prototype =
 		return this.index;
 	},
 	/*
-	 * function getDuration in milliseconds
+	 * function parseURLDuration 
+	 * getDuration in milliseconds
 	 * special case derive duration from request url
 	 * supports media_url?t=ntp_start/ntp_end url request format
 	 */
@@ -460,9 +459,9 @@ mediaSource.prototype =
 		//js_log('f:parseURLDuration() for:' + this.src  + ' d:' + this.duration);
 	},
 	/** Attempts to detect the type of a media file based on the URI.
-		@param {String} uri URI of the media file.
-		@returns The guessed MIME type of the file.
-		@type String
+	*	@param {String} uri URI of the media file.
+	*	@returns The guessed MIME type of the file.
+	*	@type String
 	*/
 	detectType:function(uri)
 	{
@@ -473,10 +472,22 @@ mediaSource.prototype =
 		var end_inx =  (uri.indexOf('?')!=-1)? uri.indexOf('?') : uri.length;
 		var no_param_uri = uri.substr(0, end_inx);
 		switch( no_param_uri.substr(no_param_uri.lastIndexOf('.'),4).toLowerCase() ){
-			case '.flv':return 'video/x-flv';break;
-			case '.ogg': case '.ogv': return 'video/ogg';break;
-			case '.oga': return 'audio/ogg'; break;
-			case '.anx':return 'video/ogg';break;
+			case '.mp4': 
+				return 'video/h264'; 
+			break;
+			case '.flv': 
+				return 'video/x-flv'; 
+			break;
+			case '.ogg': 
+			case '.ogv': 
+				return 'video/ogg';
+			break;
+			case '.oga': 
+				return 'audio/ogg'; 
+			break;
+			case '.anx':
+				return 'video/ogg';
+			break;
 		}
 	}
 };
@@ -488,7 +499,7 @@ mediaSource.prototype =
 	@param {element} video_element <video> element used for initialization.
 	@constructor
 */
-function mediaElement(video_element)
+function mediaElement( video_element )
 {
 	this.init(video_element);
 };
@@ -509,10 +520,7 @@ mediaElement.prototype =
 		var _this = this;
 		js_log('Initializing mediaElement...' );
 		this.sources = new Array();
-		this.thumbnail = mv_default_thumb_url;
-		// Process the source element:
-		if($j(video_element).attr("src"))
-			this.tryAddSource(video_element);			  
+		this.thumbnail = mv_default_thumb_url;				  
 		
 		if($j(video_element).attr('thumbnail'))
 			this.thumbnail = $j(video_element).attr('thumbnail');
@@ -522,11 +530,24 @@ mediaElement.prototype =
 		
 		if($j(video_element).attr('wikiTitleKey'))
 			this.wikiTitleKey = $j(video_element).attr('wikiTitleKey');
-			
-		// Process all inner <source> elements	
-		//js_log("inner source count: " + video_element.getElementsByTagName('source').length );
+	
+		if($j(video_element).attr('durationHint')){
+			this.durationHint = $j(video_element).attr('durationHint');			
+			//convert duration hint if needed:
+			var sc = this.durationHint.split(':');
+			if( sc.length >=1 ){
+				this.duration = npt2seconds( this.durationHint );
+			}else{
+				this.duration = parseFloat( this.durationHint );
+			}
+		}
+		
+		// Process the video_element as a source element:
+		if($j(video_element).attr("src"))
+			this.tryAddSource(video_element);	
 		
-		$j(video_element).find('source,text').each(function(inx, inner_source){			
+		// Process all inner <source> elements	
+		$j(video_element).find('source,text,itext').each(function(inx, inner_source){			
 			_this.tryAddSource( inner_source );
 		});						  
 	},
@@ -578,14 +599,15 @@ mediaElement.prototype =
 		for(var i=0; i < playable_sources.length; i++){
 			if( i==index ){
 				this.selected_source = playable_sources[i];
-				//update the user selected format: 
+				// Update the user selected format: 
 				embedTypes.players.userSelectFormat( playable_sources[i].mime_type );
 				break;
 			}
 		}		
 	},
-	/** selects the default source via cookie preference, default marked, or by id order
-	 * */
+	/** 
+	* selects the default source via cookie preference, default marked, or by id order
+	*/
 	autoSelectSource:function(){ 
 		js_log('f:autoSelectSource:');	
 		//@@todo read user preference for source		
@@ -600,14 +622,14 @@ mediaElement.prototype =
 				this.selected_source = playable_sources[source];				
 				return true;
 			}
-			//set via user-preference
+			// Set via user-preference
 			if(embedTypes.players.preference['format_prefrence'] == mime_type){
 				 js_log('set via preference: '+playable_sources[source].mime_type);
 				 this.selected_source = playable_sources[source];
 				 return true; 
 			}															
 		}	   
-		//set Ogg via player support		
+		// Set Ogg via player support		
 		for(var source=0; source < playable_sources.length; source++){
 			js_log('f:autoSelectSource:' + playable_sources[source].mime_type);
 			var mime_type =playable_sources[source].mime_type;					
@@ -623,7 +645,7 @@ mediaElement.prototype =
 				}
 			}
 		}
-		//set basic flash
+		// Set basic flash
 		for(var source=0; source < playable_sources.length; source++){  
 			var mime_type =playable_sources[source].mime_type;										
 			if( mime_type=='video/x-flv' ){
@@ -632,7 +654,7 @@ mediaElement.prototype =
 				return true;
 			}						
 		}
-		//set h264 flash 
+		// Set h264 flash 
 		for(var source=0; source < playable_sources.length; source++){  
 			var mime_type =playable_sources[source].mime_type;										
 			if( mime_type=='video/h264' ){
@@ -641,7 +663,7 @@ mediaElement.prototype =
 				return true;
 			}			   
 		}		
-		//select first source		
+		// Select first source		
 		if (!this.selected_source)
 		{
 			js_log('set via first source:' + playable_sources[0]);
@@ -683,7 +705,7 @@ mediaElement.prototype =
 		the element has a 'src' attribute.		
 		@param element {element} <video>, <source> or <mediaSource> <text> element.
 	*/
-	tryAddSource:function(element)
+	tryAddSource:function( element )
 	{
 		js_log('f:tryAddSource:'+ $j(element).attr("src"));				
 		if ( $j(element).attr("src") ){
@@ -696,8 +718,16 @@ mediaElement.prototype =
 					this.sources[i].updateSource(element);
 				}
 			}
-		}				
-		var source = new mediaSource( element );		
+		}					
+		var source = new mediaSource( element );
+		// Inherit some properties from the parent <video> element if unset: 
+		if( !source.duration && this.duration)
+			source.duration = this.duration;
+			
+		if( !source.startOffset && this.startOffset)
+			source.startOffset =this.startOffset;
+		
+				
 		this.sources.push(source);		
 		js_log('pushed source to stack'+ source + 'sl:'+this.sources.length);
 	},
@@ -820,6 +850,8 @@ embedVideo.prototype = {
 			}
 		}
 		
+		
+		
 		//set the skin name from the class  
 		var	sn = element.getAttribute('class');
 		if( sn && sn != ''){
@@ -939,7 +971,7 @@ embedVideo.prototype = {
 		}		
 	},
 	inheritEmbedObj:function(){		
-		js_log("inheritEmbedObj:duration is: " +  this.duration);  
+		js_log("inheritEmbedObj:duration is: " +  this.getDuration() );  
 		//@@note: tricky cuz direct overwrite is not so ideal.. since the extended object is already tied to the dom
 		//clear out any non-base embedObj stuff:
 		if(this.instanceOf){
@@ -1061,7 +1093,7 @@ embedVideo.prototype = {
 		//return this.wrapEmebedContainer( this.getEmbedObj() );
 		return 'function getEmbedHTML should be overitten by embedLib ';
 	},
-	//do seek function (should be overwritten by implementing embedLibs)
+	// Do seek function (should be overwritten by implementing embedLibs)
 	// to check if seek can be done on locally downloaded content. 
 	doSeek : function( perc ){		
 		if( this.supportsURLTimeEncoding() ){			
@@ -1078,7 +1110,7 @@ embedVideo.prototype = {
 	},
 	/*
 	 * seeks to the requested time and issues a callback when ready 
-	 * (should be overwitten by client that supports frame serving)
+	 * (should be overwritten by client that supports frame serving)
 	 */	
 	setCurrentTime:function( time, callback){
 		js_log('error: base embed setCurrentTime can not frame serve (override via plugin)');
@@ -1099,14 +1131,15 @@ embedVideo.prototype = {
 		this.closeDisplayedHTML();
 
 //		if(!this.selected_player){
-//			return this.getPluginMissingHTML();		
+//			return this.getPluginMissingHTML();
+		
 		//Set "loading" here
 		$j('#mv_embedded_player_'+_this.id).html(''+
 			'<div style="color:black;width:'+this.width+'px;height:'+this.height+'px;">' + 
 				gM('mwe-loading_plugin') + 
 			'</div>'					
 		);
-		// schedule embedding
+		// Schedule embedding
 		this.selected_player.load(function()
 		{
 			js_log('performing embed for ' + _this.id);			
@@ -1231,6 +1264,7 @@ embedVideo.prototype = {
 		}					
 	},
 	onClipDoneDisp:function(){
+		var _this = this;
 		//add the liks_info_div black back 
 		$j('#dc_'+this.id).append('<div id="liks_info_'+this.id+'" ' +
 				'style="width:' +parseInt(parseInt(this.width)/2)+'px;'+		
@@ -1242,8 +1276,8 @@ embedVideo.prototype = {
 	   );
 	   //start animation (make thumb small in upper left add in div for "loading"			
 		$j('#img_thumb_'+this.id).animate({				
-				width:parseInt(parseInt(_this.width)/2),
-				height:parseInt(parseInt(_this.height)/2),
+				width : parseInt( parseInt(_this.width)/2 ),
+				height : parseInt( parseInt(_this.height)/2 ),
 				top:20,
 				left:10
 			},
@@ -1925,7 +1959,7 @@ embedVideo.prototype = {
 	*  base embed controls
 	*	the play button calls
 	*/
-	play:function(){
+	play : function(){
 		var eid = (this.pc!=null)?this.pc.pp.id:this.id;
 				
 		//js_log( "mv_embed play:" + this.id);		
@@ -2084,7 +2118,7 @@ embedVideo.prototype = {
 			}
 			//check if we are "done"
 			if( this.currentTime > ( parseInt(this.duration) + 1 ) ){
-				js_log("should run clip done");
+				js_log("should run clip done ct:: " + this.currentTime + ' > ' +  parseInt( this.duration + 1 ) );
 				this.onClipDone();
 			}				
 		}else{
@@ -2289,16 +2323,16 @@ mediaPlayer.prototype =
 /* players and supported mime types 
 @@todo ideally we query the plugin to get what mime types it supports in practice not always reliable/avaliable
 */
-var flowPlayer = new mediaPlayer('flowplayer',['video/x-flv', 'video/h264'],'flash');
+var flowPlayer = new mediaPlayer('flowplayer', ['video/x-flv', 'video/h264'], 'flowplayer');
+//var kplayer = new mediaPlayer('kplayer', ['video/x-flv', 'video/h264'], 'kplayer');
 
 var omtkPlayer = new mediaPlayer('omtkplayer',['audio/ogg'], 'omtk' );
 
 var cortadoPlayer = new mediaPlayer('cortado',['video/ogg', 'audio/ogg'],'java');
 var videoElementPlayer = new mediaPlayer('videoElement',['video/ogg', 'audio/ogg'],'native');
 
-var vlcMineList = ['video/ogg','audio/ogg', 'video/x-flv', 'video/mp4',  'video/h264'];
-var vlcMozillaPlayer = new mediaPlayer('vlc-mozilla',vlcMineList,'vlc');
-var vlcActiveXPlayer = new mediaPlayer('vlc-activex',vlcMineList,'vlc');
+var vlcMineList = ['video/ogg', 'audio/ogg', 'video/x-flv', 'video/mp4',  'video/h264'];
+var vlcPlayer = new mediaPlayer('vlc-player', vlcMineList, 'vlc');
 
 //add generic
 var oggPluginPlayer = new mediaPlayer('oggPlugin',['video/ogg'],'generic');
@@ -2330,8 +2364,8 @@ mediaPlayers.prototype =
 		this.loadPreferences();
 		
 		//set up default players order for each library type		
-		this.default_players['video/x-flv'] = ['flash','vlc'];
-		this.default_players['video/h264'] = ['flash', 'vlc'];
+		this.default_players['video/x-flv'] = ['flowplayer', 'vlc'];
+		this.default_players['video/h264'] = ['flowplayer', 'vlc'];
 		
 		this.default_players['video/ogg'] = ['native','vlc','java', 'generic'];		
 		this.default_players['application/ogg'] = ['native','vlc','java', 'generic'];		
@@ -2521,6 +2555,8 @@ var embedTypes = {
 				}				
 				//flowplayer has pretty good compatiablity 
 				// (but if we wanted to be fancy we would check for version of flash and update the mp4/h.264 support
+				
+				//this.players.addPlayer( kplayer );
 				this.players.addPlayer( flowPlayer );				   
 			}
 			 // VLC
@@ -2575,7 +2611,7 @@ var embedTypes = {
 					pluginName = '';
 				}				
 				if ( pluginName.toLowerCase() == 'vlc multimedia plugin' || pluginName.toLowerCase() == 'vlc multimedia plug-in' ) {
-					this.players.addPlayer(vlcMozillaPlayer, type);
+					this.players.addPlayer( vlcPlayer, type);
 					continue;
 				}
 		
@@ -2607,8 +2643,10 @@ var embedTypes = {
 					this.players.addPlayer(vlcMozillaPlayer, type);
 					continue;
 				}*/
-				if(type=='application/x-shockwave-flash'){
-					this.players.addPlayer( flowPlayer );
+				if( type == 'application/x-shockwave-flash' ){
+				
+					//this.players.addPlayer( kplayer );
+					this.players.addPlayer( flowPlayer );	
 					
 					//check version to add omtk:
 					var flashDescription = navigator.plugins["Shockwave Flash"].description;
diff --git a/js2/mwEmbed/libEmbedVideo/flashEmbed.js b/js2/mwEmbed/libEmbedVideo/flowplayerEmbed.js
similarity index 99%
rename from js2/mwEmbed/libEmbedVideo/flashEmbed.js
rename to js2/mwEmbed/libEmbedVideo/flowplayerEmbed.js
index ef83a2df6c..7964254602 100644
--- a/js2/mwEmbed/libEmbedVideo/flashEmbed.js
+++ b/js2/mwEmbed/libEmbedVideo/flowplayerEmbed.js
@@ -1549,22 +1549,19 @@ if (jQ) {
 /************************************************
 ********* mv_embed extension to flowplayer.js ***
 ************************************************/	 
-var flashEmbed = {
-	instanceOf:'flashEmbed',
+var flowplayerEmbed = {
+	instanceOf:'flowplayerEmbed',
 	monitorTimerId : 0,
 	old_pid:0,
 	didSeekJump:false,
 	startedTimedPlayback:false,		
 	didDateStartTimeRestore:false,
 	supports: {
-		'play_head':true, 
-		'pause':true,
-		'stop':true, 
-		//'fullscreen':true, 
-		'time_display':true, 
-		'volume_control':true,
-		'overlay':false,
-		'fullscreen':false
+		'play_head' : true, 
+		'pause' : true,
+		'stop' : true, 
+		'time_display' : true, 
+		'volume_control' : true
 	},
 	getEmbedHTML: function (){
 		setTimeout('document.getElementById(\''+this.id+'\').postEmbedJS()', 150);
diff --git a/js2/mwEmbed/libEmbedVideo/kplayerEmbed.js b/js2/mwEmbed/libEmbedVideo/kplayerEmbed.js
new file mode 100644
index 0000000000..6a8dfdaace
--- /dev/null
+++ b/js2/mwEmbed/libEmbedVideo/kplayerEmbed.js
@@ -0,0 +1,74 @@
+var kplayerEmbed={
+	instanceOf:'kflashEmbed',
+	supports: {
+		'play_head':true, 
+		'pause':true,
+		'stop':true, 
+		'time_display':true, 
+		'volume_control':true,
+		'overlay':false,
+		'fullscreen':false
+	},
+	getEmbedHTML : function (){		
+		var embed_code =  this.getEmbedObj();		
+		//setTimeout('$j(\'#' + this.id + '\').get(0).postEmbedJS()', 2000);
+		js_log("return embed html");
+		return this.wrapEmebedContainer( embed_code);			
+	},	
+	getEmbedObj:function(){
+		var player_path = mv_embed_path + 'binPlayers/kaltura-player/player.swf';	
+		return '<object id="'+this.pid+'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" '+ 
+				'width="' +this.width+'" height="' + this.height + '">'+
+					'<param name="movie" value="'+ player_path +'" />' +
+					'<param name="allowfullscreen" value="true" />' +
+					'<param name="allowscriptaccess" value="always" />' +
+					'<param name="flashvars" value="file=video.flv&image=preview.jpg" />' +
+				'<embed '+
+					'type="application/x-shockwave-flash" '+
+					'id="'+this.pid+'" '+					
+					'src="' + player_path +'" '+ 
+					'width="' + this.width + '" '+ 
+					'height="' + this.height + '" '+
+					'allowscriptaccess="always" '+ 
+					'allowfullscreen="true" '+
+					'flashvars="autostart=true&file=' + escape(  this.getSrc() ) + '" '+ 
+				'/>'+
+			'</object>';		
+		/*return  '<object id="'+this.pid+'" type="application/x-shockwave-flash"'+ 
+				'allowScriptAccess="always" allowNetworking="all" allowFullScreen="true" '+
+				'height="'+  parseInt(this.height) + '" ' +
+				'width="' + parseInt(this.width) + '" ' +
+				'data="http://www.kaltura.com/index.php/kwidget/wid/_309/uiconf_id/1000106">'+
+					'<param name="allowScriptAccess" value="always"/>'+
+					'<param name="allowNetworking" value="all"/>'+
+					'<param name="allowFullScreen" value="true"/>'+
+					'<param name="bgcolor" value="#000000"/>'+
+					'<param name="movie" value="http://www.kaltura.com/index.php/kwidget/wid/_0/uiconf_id/1000106"/>'+
+					'<param name="flashVars" value="emptyF=onKdpEmpty&readyF=onKdpReady&'+
+						//set the url: 
+						'entryId=' + escape(  this.getSrc() ) + '"/>'+
+					'<param name="wmode" value="opaque"/>'+
+				'</object>';	*/		
+	},
+	postEmbedJS:function(){		
+		this.monitor();
+	},
+	pause:function(){
+		this.stop();
+	},
+	monitor:function(){		
+		//this.parent_monitor();	
+	}
+}
+
+function onKdpReady(playerId) {
+ 	 js_log("IN THEORY PLAYER IS READY");
+ 	 /*
+	 window.myKdp=get(playerId);
+	 get("Player_State").innerHTML="<br>&nbsp; READY (Id=" + playerId + ")";
+	 get("nowPlaying").innerHTML=(myKdp.evaluate('{entryId}'));
+	 getDuration();
+	 attachKdpEvents();
+	 addKdpListners();
+	 */
+ }
\ No newline at end of file
diff --git a/js2/mwEmbed/libEmbedVideo/nativeEmbed.js b/js2/mwEmbed/libEmbedVideo/nativeEmbed.js
index 2b66df0dd8..69b830cafe 100644
--- a/js2/mwEmbed/libEmbedVideo/nativeEmbed.js
+++ b/js2/mwEmbed/libEmbedVideo/nativeEmbed.js
@@ -80,26 +80,29 @@ var nativeEmbed = {
 		this.seeking = false;
 	},
 	doSeek:function(perc){					
-		//js_log('native:seek:p: ' + perc+ ' : '  + this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' + this.seek_time_sec );		
+		js_log('native:seek:p: ' + perc+ ' : '  + this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' + this.seek_time_sec );		
 		//@@todo check if the clip is loaded here (if so we can do a local seek)
-		if( this.supportsURLTimeEncoding() || !this.vid){			
-			//make sure we could not do a local seek instead:
+		if( this.supportsURLTimeEncoding() ){			
+			// Make sure we could not do a local seek instead:
 			if( perc < this.bufferedPercent && this.vid.duration && !this.didSeekJump ){
 				js_log("do local seek " + perc + ' is already buffered < ' + this.bufferedPercent);
 				this.doNativeSeek(perc);
-			}else{
+			}else{			
+				// We support URLTimeEncoding call parent seek: 
 				this.parent_doSeek(perc);
 			}			
 		}else if(this.vid && this.vid.duration ){	   
 			//(could also check bufferedPercent > perc seek (and issue oggz_chop request or not) 
 			this.doNativeSeek( perc );	
 		}else{
+			//try to do a play then seek: 
 			this.doPlayThenSeek( perc )
 		}				  
 	},	
 	doNativeSeek:function(perc){	
+		js_log('native::doNativeSeek::' + perc);
 		this.seek_time_sec=0;			 
-		this.vid.currentTime = perc * this.vid.duration;		
+		this.vid.currentTime = perc * this.duration;		
 		this.monitor();	
 	},
 	doPlayThenSeek:function(perc){
@@ -107,14 +110,17 @@ var nativeEmbed = {
 		var _this = this;
 		this.play();
 		var rfsCount = 0;
-		var readyForSeek = function(){
-			_this.getVID();		
+		var readyForSeek = function(){		
+			_this.getVID();
+			if(_this.vid)		
+				js_log('readyForSeek looking::' + _this.vid.duration);
 			//if we have duration then we are ready to do the seek
-			if(this.vid && this.vid.duration){
-				_this.doSeek( perc );
+			if( _this.vid && _this.vid.duration ){
+				_this.doNativeSeek( perc );
 			}else{			
-				//try to get player for 10 seconds: 
-				if( rfsCount < 200 ){
+				//Try to get player for 40 seconds: 
+				//(it would be nice if the onmetadata type callbacks where fired consistently)
+				if( rfsCount < 800 ){
 					setTimeout(readyForSeek, 50);
 					rfsCount++;
 				}else{
diff --git a/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js b/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
index e42f4cb95e..73888eca8a 100644
--- a/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
+++ b/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
@@ -12,7 +12,8 @@ loadGM({
 	"mwe-effects" : "Effects stack",
 	"mwe-remove_transition" : "Remove transition",
 	"mwe-edit_transin" : "Edit transition into clip",
-	"mwe-edit_transout" : "Edit transition out of clip"
+	"mwe-edit_transout" : "Edit transition out of clip",
+	"mwe-add-transition" : "Add a Transition"
 });
 
 var default_timed_effect_values = {
@@ -246,12 +247,12 @@ mvTimedEffectsEdit.prototype = {
 				break;
 			}
 		}
-		//and finally add effect timeline scrubber (for timed effects this also stores keyframes)
+		//and finally add effect timeline scruber (for timed effects this also stores keyframes)
 
 	},
 	getTransitionListControl : function(target_out){
 		js_log("getTransitionListControl");
-		var o= '<h3>Add a Transition:</h3>';
+		var o= '<h3>' + gM('mwe-add-transition') +'</h3>';
 		for(var type in mvTransLib['type']){
 			js_log('on tran type: ' + i);
 			var base_trans_name = i;
diff --git a/js2/mwEmbed/libTimedText/mvTextInterface.js b/js2/mwEmbed/libTimedText/mvTextInterface.js
index 8a2a2d8881..917ca374d6 100644
--- a/js2/mwEmbed/libTimedText/mvTextInterface.js
+++ b/js2/mwEmbed/libTimedText/mvTextInterface.js
@@ -39,21 +39,26 @@ mvTextInterface.prototype = {
 		//if roe not yet loaded do load it:
 		if(this.pe.roe || _this.pe.wikiTitleKey ){
 			if(!this.pe.media_element.addedROEData){
-				js_log("load roe data!");
 				$j('#mv_txt_load_'+_this.pe.id).show(); //show the loading icon
-				if(_this.pe.roe){
+				if( _this.pe.roe ){
 					do_request( _this.pe.roe, function(data)
 					{
 						_this.pe.media_element.addROE(data);
 						_this.getParseTimedText_rowReady();
 					});
 				}else if( _this.pe.wikiTitleKey ){
+					//check for a clear namespace key:
+					var timedtext_ns = 102; 				
+					if( wgNamespaceIds && wgNamespaceIds['timedtext']){
+						timedtext_ns = wgNamespaceIds['timedtext'];
+					}
 					do_api_req({
 							'url' :	apiUrl,
 							'data': {
 								'list' : 'allpages',
 								'apprefix' : _this.pe.wikiTitleKey,
-								'apnamespace' : 102
+								'apnamespace' : timedtext_ns,
+								'prop':'revisions'
 							}
 					}, function( subData ) {
 						if(	subData.error && subData.error.code == 'apunknown_apnamespace'){
@@ -87,6 +92,8 @@ mvTextInterface.prototype = {
 		var _this = this;
 		//look for text tracks:
 		var foundTextTracks = false;
+		
+		//get all the known languages:
 		do_api_req({
 			'url':	hostPath + '/api.php',
 			'data': {
@@ -117,17 +124,13 @@ mvTextInterface.prototype = {
 							'category' : 'SUB',
 							'lang' 	: langKey,
 							'type' 	: _this.suportedMime[ extension ],
-							'title'	: langData[ langKey],							
+							'title'	: langData[ langKey]									
+						});
+						// We use the api since ?action raw on the real title has cache issues 
+						$j( textElm ).attr({
+							'apisrc'	: hostPath + '/api.php',
+							'titleKey' 	: subPage.title
 						});
-						//set src to remote friendly 
-						if( wgServer &&  hostPath.indexOf(wgServer)!==-1){
-							$j(textElm).attr('src', hostPath + '/index.php?title=' + subPage.title + '&action=raw');
-						}else{
-							$j(textElm).attr({
-								'apisrc'	: hostPath + '/api.php',
-								'titleKey' 	: subPage.title
-							});
-						}												
 						_this.pe.media_element.tryAddSource( textElm );
 						foundTextTracks = true;											
 					}
@@ -192,12 +195,12 @@ mvTextInterface.prototype = {
 			if( typeof source.id == 'undefined' || source.id == null ){
 				source.id = 'text_' + inx;
 			}
-			var tObj = new timedTextObj( source ); 
+			var tObj = new timedTextObj( source );
 			//make sure its a valid timed text format (we have not loaded or parsed yet) : (
 			if( tObj.lib != null ){	
 				_this.availableTracks.push( tObj );				
-				//display if requested:
-				if( ( wgUserLanguage && source['lang'] == wgUserLanguage ) || source['default'] == "true" ){
+				//display requested language if we can know that: 
+				if( ( typeof wgUserLanguage != 'undefined' && source['lang'] == wgUserLanguage ) || source['default'] == "true" ){
 					//we did set at least one track by default tag
 					found_tracks = true;					
 					_this.loadAndDisplay( _this.availableTracks.length -1 );
@@ -206,15 +209,17 @@ mvTextInterface.prototype = {
 				}
 			}
 		});
+		
 		//no default clip found take the userLanguage key if set:
-		if(!found_tracks){			
+		if( !found_tracks ){			
 			$j.each( _this.availableTracks, function(inx, source){				
 				_this.loadAndDisplay( inx );
 				found_tracks=true;
 				//return after loading first available
 				return false;
 			});
-		}		
+		}
+		
 	    //if nothing found anywhere give the not found msg: 
 		if(!found_tracks){
 			$j( '#metaBox_' + _this.pe.id).html( ''+
@@ -226,11 +231,11 @@ mvTextInterface.prototype = {
 	loadAndDisplay: function ( track_id){
 		var _this = this;
 		$j('#mv_txt_load_'+_this.pe.id).show();//show the loading icon
-		_this.availableTracks[ track_id ].load(_this.default_time_range, function(){
+		_this.availableTracks[ track_id ].load( _this.default_time_range, function(){
 			$j('#mv_txt_load_'+_this.pe.id).hide();
 			_this.addTrack( track_id );
 		});
-	},
+	},	
 	addTrack: function( track_id ){
 		js_log('f:displayTrack:'+ track_id);
 		var _this = this;
@@ -238,7 +243,7 @@ mvTextInterface.prototype = {
 		_this.availableTracks[ track_id ].display=true;
 		//setup the layout:
 		this.setup_layout();
-		js_log("SHOULD ADD: track:"+ track_id + ' count:' +  _this.availableTracks[ track_id ].textNodes.length);
+		js_log( "SHOULD ADD: track:" + track_id + ' count:' +  _this.availableTracks[ track_id ].textNodes.length);
 
 		//a flag to avoid checking all clips if we know we are adding to the end:
 		_this.add_to_end_on_this_pass = false;
@@ -248,10 +253,12 @@ mvTextInterface.prototype = {
 		var track_id = track_id;
 		var addNextClip = function(){
 			var text_clip = _this.availableTracks[ track_id ].textNodes[i];
-			_this.add_merge_text_clip(text_clip, track_id);
-			i++;
-			if(i < _this.availableTracks[ track_id ].textNodes.length){
-				setTimeout(addNextClip, 1);
+			if(	text_clip ){	
+				_this.add_merge_text_clip(text_clip, track_id);
+				i++;
+				if(i < _this.availableTracks[ track_id ].textNodes.length){
+					setTimeout(addNextClip, 1);
+				}
 			}
 		}
 		addNextClip();
@@ -259,7 +266,7 @@ mvTextInterface.prototype = {
 	add_merge_text_clip: function( text_clip, track_id ){
 		var _this = this;
 		//make sure the clip does not already exist:
-		if($j('#tc_'+text_clip.id).length==0){
+		if( $j('#tc_'+text_clip.id).length==0 ){
 			var inserted = false;
 			var text_clip_start_time = npt2seconds( text_clip.start );
 
diff --git a/js2/mwEmbed/libTimedText/mvTimeTextEdit.js b/js2/mwEmbed/libTimedText/mvTimeTextEdit.js
index f1aabad3ce..965d27733f 100644
--- a/js2/mwEmbed/libTimedText/mvTimeTextEdit.js
+++ b/js2/mwEmbed/libTimedText/mvTimeTextEdit.js
@@ -9,11 +9,12 @@ if( !mwAddMediaConfig )
 var mvTimedTextEdit = {};
 
 loadGM({
-  "mwe-add-subs-file"      : "Add/replace subtitle",
-  "mwe-add-subs-file-title": "Select subtitle to upload",
-  "mwe-error-only-srt"     : "You can only upload srt files.",
-  "mwe-watch-video"        : "Watch video",
-  "mwe-select-other-language": "Select other language"
+  "mwe-upload-subs-file" : "Upload subtitle",
+  "mwe-add-subs-file-title" : "Select subtitle to upload",
+  "mwe-error-only-srt" : "You can only upload srt files.",
+  "mwe-watch-video" : "Watch video",
+  "mwe-select-other-language" : "Select other language",
+  "mwe-saving" : "saving.."
 })
 
 
@@ -25,7 +26,7 @@ js2AddOnloadHook( function() {
       return srtData;
   }
   function getVideoTitle() {
-    var videoTitle = wgTitle.split('.');
+    var videoTitle = wgPageName.split('.');
     videoTitle.pop();
     videoTitle.pop();
     videoTitle = videoTitle.join('.').replace('TimedText:', 'File:');
@@ -80,13 +81,13 @@ js2AddOnloadHook( function() {
           cBtn[ gM('mwe-ok') ] = function(){
           	//get language from form
             langKey = $j('#timed_text_language').val();
-            var title = wgTitle.split('.');
+            var title = wgPageName.split('.');
             title.pop();
             title.pop();
             title = title.join('.') + '.' + langKey + '.srt';
             
             var file = $j('#timed_text_file_upload');
-            if( file[0].files[0]){
+            if(!file[0].files[0]){
             	//no file to upload just jump to the lang key: 
             	document.location.href = wgArticlePath.replace('/$1', '?title=' + title + '&action=edit');
             	return ;
@@ -105,7 +106,7 @@ js2AddOnloadHook( function() {
 
             if(extension == "srt") {
               var srt = getSubtitle(file[0]);
-              $j(this).html("saving...");
+              $j(this).text( gM('mwe-saving' ) );
               $j('.ui-dialog-buttonpane').remove();
 
               var editToken = $j('input[name=wpEditToken]').val();
@@ -147,14 +148,14 @@ js2AddOnloadHook( function() {
   $j(tselect).after(ttoolbar);
 
   var button = $j('<button>');
-  button.click(uploadSubtitles)
-  button.text(gM("mwe-add-subs-file"));
-  ttoolbar.append(button);
+	  button.click(uploadSubtitles)
+	  button.text(gM("mwe-upload-subs-file"));
+	  ttoolbar.append(button);
   ttoolbar.append(' ');
 
   var button = $j('<button>');
-  button.click(function() { document.location.href = wgArticlePath.replace('$1', getVideoTitle()); })
-  button.text(gM("mwe-watch-video"));
+	  button.click(function() { document.location.href = wgArticlePath.replace('$1', getVideoTitle()); })
+	  button.text(gM("mwe-watch-video"));
   ttoolbar.append(button);
 
 });
diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index ad0998ca74..4303feee68 100644
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -132,7 +132,8 @@ lcPaths({
 	"mvClipEdit"			: "libClipEdit/mvClipEdit.js",
 
 	"embedVideo"		: "libEmbedVideo/embedVideo.js",
-	"flashEmbed"		: "libEmbedVideo/flashEmbed.js",
+	"flowplayerEmbed"	: "libEmbedVideo/flowplayerEmbed.js",
+	"kplayerEmbed"		: "libEmbedVideo/kplayerEmbed.js",
 	"genericEmbed"		: "libEmbedVideo/genericEmbed.js",
 	"htmlEmbed"			: "libEmbedVideo/htmlEmbed.js",
 	"javaEmbed"			: "libEmbedVideo/javaEmbed.js",
@@ -1010,8 +1011,10 @@ var mvJsLoader = {
 		//js_log( 'jQueryCheck::' );
 		var _this = this;
 		// Skip stuff if $j is already loaded:
-		if( _global['$j'] && callback ){
-			callback();
+		if( _global['$j'] ){
+			callback(); //call the callback now
+			callback=null;
+			// Check if we have jquery-ui css loaded and assigned skin globals
 			if( _this.jQuerySetupFlag )
 				return ;
 		}		
@@ -1046,11 +1049,12 @@ var mvJsLoader = {
 				// Set up mvEmbed jQuery bindings and config based dependencies
 				mv_jqueryBindings();
 				_this.jQuerySetupFlag = true;
-			}
-			// Run the callback
-			if( callback ) {
-				callback();
-			}
+				
+				// Run the callback if not already run above
+				if( callback ) {
+					callback();
+				}
+			}			
 		});
 	},
 	embedVideoCheck:function( callback ) {
@@ -1093,6 +1097,7 @@ var mvJsLoader = {
 		});
 	},
 	addLoadEvent: function( fn ) {
+		//js_log('add ready event: ' + fn );
 		this.onReadyEvents.push( fn );
 	},
 	// Check the jQuery flag. This way, when remote embedding, we don't load jQuery
@@ -1106,7 +1111,7 @@ var mvJsLoader = {
 		});
 	},
 	runReadyEvents: function() {
-		js_log( "runReadyEvents" );
+		js_log( "runReadyEvents" +  this.onReadyEvents.length );
 		while( this.onReadyEvents.length ) {	
 			var func = this.onReadyEvents.shift();
 			//js_log('run onReady:: ' + func );
@@ -1663,15 +1668,25 @@ function npt2seconds( npt_str ) {
 	// Strip "npt:" time definition if present
 	npt_str = npt_str.replace( 'npt:', '' );
 
+	var hour = 0;
+	var min = 0;
+	var sec = 0;
+
 	times = npt_str.split( ':' );
-	if( times.length != 3 ){
-		js_log( 'error: npt2seconds on ' + npt_str );
-		return false;
+	if( times.length == 3 ){
+		sec = times[2];
+		min = times[1];
+		hour = times[0];
+	}else if(times.length == 2){
+		sec = times[1];
+		min = times[0];
+	}else{
+		sec = times[0];
 	}
 	// Sometimes a comma is used instead of period for ms
-	times[2] = times[2].replace( /,\s?/, '.' );
+	sec = sec.replace( /,\s?/, '.' );
 	// Return seconds float
-	return parseInt( times[0] * 3600) + parseInt( times[1] * 60 ) + parseFloat( times[2] );
+	return parseInt( hour * 3600) + parseInt( min * 60 ) + parseFloat( sec );
 }
 /*
  * Simple helper to grab an edit token
@@ -1769,7 +1784,7 @@ function do_api_req( options, callback ) {
 	}
 }
 function mwGetLocalApiUrl( url ) {
-	if ( wgServer && wgScriptPath ) {
+	if ( typeof wgServer != 'undefined' && typeof wgScriptPath  != 'undefined') {
 		return wgServer + wgScriptPath + '/api.php';
 	}
 	return false;
diff --git a/js2/mwEmbed/php/languages/mwEmbed.i18n.php b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
index 5d7eb56da3..e9fd645a8e 100644
--- a/js2/mwEmbed/php/languages/mwEmbed.i18n.php
+++ b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
@@ -55,10 +55,12 @@ $messages['en'] = array(
 	/*
 	 * js file: /libTimedText/mvTimeTextEdit.js
 	 */
-	 'mwe-add-subs-file'      => 'Add/replace subtitle',
-	 'mwe-add-subs-file-title'=> 'Select subtitle to upload',
-	 'mwe-error-only-srt'     => 'You can only upload srt files.',
-	 'mwe-watch-video'        => 'Watch video',
+	 'mwe-upload-subs-file' => "Upload/replace subtitle",
+	 'mwe-add-subs-file-title' => 'Select subtitle to upload',
+	 'mwe-error-only-srt' => 'You can only upload srt files.',
+	 'mwe-watch-video' => 'Watch video',
+ 	 'mwe-select-other-language' => 'Select other language',
+ 	 'mwe-saving' => 'saving..',
 
 	/*
 	 * js file: /libSequencer/mvTimedEffectsEdit.js
@@ -278,6 +280,20 @@ $messages['en'] = array(
 	'mwe-ftype-ogg' => 'Ogg video file',
 	'mwe-ftype-unk' => 'Unknown file format',
 
+	'rsd-wiki_commons-title'=> 'Wikimedia Commons',
+	'rsd-wiki_commons'=> 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)',
+
+	'rsd-this_wiki-title' => 'This Wiki',
+	'rsd-this_wiki-desc' => 'The local wiki install',
+
+	'rsd-archive_org-title'=> 'Archive.org',
+	'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts',
+
+	'rsd-flickr-title' => 'Flickr.com',
+	'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site',
+	'rsd-metavid-title' => 'Meavid.org',
+	'rsd-metavid-desc' => 'Metavid a community archive of US House and Senate floor proceedings',
+
 	/*
 	 * js file: /libAddMedia/simpleUploadForm.js
 	 */
diff --git a/js2/mwEmbed/skins/ctrlBuilder.js b/js2/mwEmbed/skins/ctrlBuilder.js
index 3f7908dd56..2e42750cd1 100644
--- a/js2/mwEmbed/skins/ctrlBuilder.js
+++ b/js2/mwEmbed/skins/ctrlBuilder.js
@@ -213,7 +213,7 @@ ctrlBuilder.prototype = {
 					embedObj.seek_time_sec = npt2seconds( embedObj.jump_time, true );
 					js_log('do jump to: '+embedObj.jump_time + ' perc:' +perc + ' sts:' + embedObj.seek_time_sec);
 					embedObj.setStatus( gM('mwe-seeking') );
-					embedObj.doSeek(perc);
+					embedObj.doSeek( perc );
 				}
 			}
 		});
diff --git a/js2/remoteMwEmbed.js b/js2/remoteMwEmbed.js
index 5d5e8a61e0..a53416af6c 100644
--- a/js2/remoteMwEmbed.js
+++ b/js2/remoteMwEmbed.js
@@ -5,18 +5,16 @@
  
 var urlparts = getRemoteEmbedPath();
 var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = '1.05';
+var mwRemoteVersion = '1.06';
 var mwUseScriptLoader = true;
 
-reqArguments = urlparts[1];
-
 //setup up request Params: 
 var reqParts = urlparts[1].substring(1).split('&');
-var reqParam={};
+var mwReqParam={};
 for(var i=0;i< reqParts.length; i++){
 	var p = reqParts[i].split('=');
 	if( p.length == 2 )
-		reqParam[ p[0] ]=  p[1];
+		mwReqParam[ p[0] ] = p[1];
 }
 
 addOnloadHook( function(){
@@ -30,13 +28,14 @@ function doPageSpecificRewrite() {
 	// Add media wizard
 	if( wgAction == 'edit' || wgAction == 'submit' ) {
 		load_mv_embed( function() {	
-			loadExternalJs( mwEmbedHostPath + '/editPage.js' + reqArguments );
-		} );
+			loadExternalJs( mwEmbedHostPath + '/editPage.js?' + mwGetReqArgs() );
+		});
 	}
 	
 	// Timed text display:
 	if(wgPageName.indexOf("TimedText") === 0){		
 		load_mv_embed(function(){
+			// Load with mw loader to get localized interface:
 			$mw.load( ['mvTimeTextEdit'],function(){
 				//could run init here (but mvTimeTextEdit included onLoad actions)
 			});
@@ -46,7 +45,7 @@ function doPageSpecificRewrite() {
 	// Firefogg integration
 	if( wgPageName == "Special:Upload" ){		
 		load_mv_embed( function() {
-			loadExternalJs( mwEmbedHostPath + '/uploadPage.js' + reqArguments );
+			loadExternalJs( mwEmbedHostPath + '/uploadPage.js?' + mwGetReqArgs() );
 		} );
 	}
 	
@@ -55,7 +54,7 @@ function doPageSpecificRewrite() {
 		var wgEnableIframeApiProxy = true;
 		load_mv_embed( function() {
 			js_log("Wiki:ApiProxy::");
-			loadExternalJs( mwEmbedHostPath + '/apiProxyPage.js' + reqArguments );
+			loadExternalJs( mwEmbedHostPath + '/apiProxyPage.js?' + mwGetReqArgs() );
 		});
 	}
 	
@@ -166,30 +165,37 @@ function getRemoteEmbedPath() {
 		}
 	}
 }
+function mwGetReqArgs(){
+	var rurl = '';
+	if(mwReqParam['debug'])
+		rurl += 'debug=true&';
 
-function load_mv_embed( callback ) {	
+	if(mwReqParam['uselang'] )
+		rurl += 'uselang=' + mwReqParam['uselang'] + '&';
+
+	if( mwReqParam['urid'] ){
+		rurl += 'urid=' + mwReqParam['urid'];
+	}else{
+		// Make sure to use an urid 
+		// This way remoteMwEmbed can control version of code being requested
+		rurl += 'urid=' + mwRemoteVersion;
+	}
+	return rurl;
+}
+function load_mv_embed( callback ) {
 	// Inject mv_embed if needed
 	if( typeof $mw == 'undefined' ) {	
-		if( ( reqParam['uselang'] || reqParam['useloader'] ) && mwUseScriptLoader){
+		if( ( mwReqParam['uselang'] || mwReqParam['useloader'] ) && mwUseScriptLoader){
 			var rurl = mwEmbedHostPath + '/mwEmbed/jsScriptLoader.php?class=mv_embed';
 			// Add jQuery too if we need it: 
 			if(typeof window.jQuery == 'undefined'){
-				rurl+= ',window.jQuery';
-			}
-			if(reqParam['urid']){
-				rurl+='&urid=' + reqParam['urid'];
-			}else{
-				rurl+='&urid=' + mwRemoteVersion;
-			}
-			if(reqParam['debug'])
-				rurl+='&debug=true';
-
-			if(reqParam['uselang'] )
-				rurl+='&uselang=' + reqParam['uselang'];
+				rurl += ',window.jQuery';
+			}	
+			rurl += '&' + mwGetReqArgs();								
 							
-			importScriptURI(rurl); 
+			importScriptURI( rurl ); 
 		}else{
-			importScriptURI( mwEmbedHostPath + '/mwEmbed/mv_embed.js' + reqArguments );
+			importScriptURI( mwEmbedHostPath + '/mwEmbed/mv_embed.js?' + mwGetReqArgs() );
 		}
 	}
 	check_for_mv_embed( callback );
-- 
2.20.1